(mail-abbrev-in-expansion-header-p): Use mail-header-end.

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 14ca13b8b17b0f776bf8802f3071b50c7abdd383..8a3b67212236b88d119678d56752eb2d584e8246 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -447,13 +447,8 @@ of a mail alias.")
        ;; are we at the front of an appropriate header line?
        (looking-at mail-abbrev-mode-regexp))
      ;;
-     ;; ...and we are before the mail-header-separator
-     (< (point)
-       (save-excursion
-         (goto-char (point-min))
-         (search-forward (concat "\n" mail-header-separator "\n")
-                         nil 0)
-         (point))))))
+     ;; ...and are we in the headers?
+     (< (point) (mail-header-end)))))
 
 (defvar mail-mode-abbrev-table) ; quiet the compiler